bitkeeper revision 1.959.1.6 (40d0507aE-twJSY4-XmX54p5hahgFA)

Fix make, package setup for xm.

diff --git a/.rootkeys b/.rootkeys
index 936353def586a8efeeb1c7088e85711e30163c25..05a77aa9e8cb35a20522219921e5a2efa69d0a2a 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -264,6 +264,7 @@
 40c9c46925x-Rjb0Cv2f1-l2jZrPYg tools/xenmgr/lib/server/netif.py
 40c9c469ZqILEQ8x6yWy0_51jopiCg tools/xenmgr/lib/server/params.py
 40c9c469LNxLVizOUpOjEaTKKCm8Aw tools/xenmgr/lib/sxp.py
+40d05079aFRp6NQdo5wIh5Ly31c0cg tools/xenmgr/lib/xm/__init__.py
 40cf2937gKQcATgXKGtNeWb1PDH5nA tools/xenmgr/lib/xm/create.py
 40cf2937isyS250zyd0Q2GuEDoNXfQ tools/xenmgr/lib/xm/main.py
 40cf2937PSslwBliN1g7ofDy2H_RhA tools/xenmgr/lib/xm/opts.py

diff --git a/tools/Makefile b/tools/Makefile
index 37e373c789d04b88a36fe03a98ee8800f493f230..8e9c8e77fdddf41f49f9f1c395dee19d9f9ab3cf 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -32,5 +32,5 @@ clean:
        $(MAKE) -C xentrace clean
        $(MAKE) -C xenctl clean
        $(MAKE) -C xend clean
-       $(MAKE) -C xenmgr install
+       $(MAKE) -C xenmgr clean
 

diff --git a/tools/xenmgr/lib/xm/__init__.py b/tools/xenmgr/lib/xm/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tools/xenmgr/lib/xm/create.py b/tools/xenmgr/lib/xm/create.py
index e09f5673113e7d3062e19d44cb1325649fbbca8d..e173a548dc624fc5ff0083c498363ea20e6fc12d 100644 (file)
--- a/tools/xenmgr/lib/xm/create.py
+++ b/tools/xenmgr/lib/xm/create.py
@@ -86,7 +86,7 @@ opts.opt('nics', val="N",
          use="Set the number of network interfaces.")
 
 opts.opt('vnet', val='VNET',
-         fn=set_append_value, default=[],
+         fn=append_value, default=[],
          use="""Define the vnets for the network interfaces.
          More than one vnet may be given, they are used in order.
          """)
@@ -227,7 +227,7 @@ def preprocess_ip(opts):
           + ':' + opts.gateway
           + ':' + opts.netmask
           + ':' + opts.hostname
-          + ':' : opts.interface
+          + ':' + opts.interface
           + ':' + opts.dhcp)
     opts.cmdline_ip = ip
 

diff --git a/tools/xenmgr/lib/xm/main.py b/tools/xenmgr/lib/xm/main.py
index 0bc56e699c4ad48179b67f09d2ea2704b02942b0..1810c8dde0e05ed47f3cf5b823b41072587c80c5 100644 (file)
--- a/tools/xenmgr/lib/xm/main.py
+++ b/tools/xenmgr/lib/xm/main.py
@@ -32,7 +32,7 @@ class Xm:
                 return 1
         return 0
 
-    def unknown(self, args):
+    def unknown(self, help, args):
         self.err("Unknown command: %s\nTry '%s help' for more information."
                  % (args[0], self.prog))
 

diff --git a/tools/xenmgr/lib/xm/shutdown.py b/tools/xenmgr/lib/xm/shutdown.py
index 21782f36d034db46e998b18ace5524d5b59c5557..805af2929d4cbe7bd7cfd092a6f4853301574579 100644 (file)
--- a/tools/xenmgr/lib/xm/shutdown.py
+++ b/tools/xenmgr/lib/xm/shutdown.py
@@ -3,7 +3,7 @@ import sys
 import time
 
 from xenmgr.XendClient import server
-from xenmgr.xm import opts
+from xenmgr.xm.opts import *
 
 opts = Opts(use="""[options] [DOM]
 

diff --git a/tools/xenmgr/setup.py b/tools/xenmgr/setup.py
index b08cf29c312a8fb2ef2d8716493132892971ee0c..b7f76139beb311a3f8e6d55d895f0a6147933106 100644 (file)
--- a/tools/xenmgr/setup.py
+++ b/tools/xenmgr/setup.py
@@ -9,6 +9,6 @@ setup(name            = PACKAGE,
       description     = 'Xen Management API',
       author          = 'Mike Wray',
       author_email    = 'mike.wray@hp.com',
-      packages        = [ PACKAGE, PACKAGE + '.server' ],
+      packages        = [ PACKAGE, PACKAGE + '.server', PACKAGE + '.xm' ],
       package_dir     = { PACKAGE: 'lib' },
       )